Modified controller unit tests