Set up more controllers for testing. Removed place-holder test.