Changed cli controller tests to use mock properly