more tests and clean up the controller a little more.