Fixing build for controller unit tests errors