Wrote more test and clenup controllers.