Issue #3267644 by danflanagan8, mglaman: Custom Block (block_content) tests should not rely on Classy (cherry picked from commit d9fb9301)