WIP: squash, added tests for requiring controllers