More abstract & conditional/inheritance controller tests.
Move even more state into LayoutFinder.