removed arbitrary tests
added controller testing
added controller testing