Refactor controller tests and change params