complete  controller tests
controller cleanup