Add controller unit tests

Done