Issue #1987694 by ianthomas_uk, disasm, rlmumford, vijaycs85: Convert entity_test callbacks to a new style controller.