Add some new controllers, and refine tests