adjust tests and make better controller testing