Fixed controller unit tests