Clean up controller unit tests using spies