Add some basic controllers. Restructure tests.