Fixed tests; appended Controller to controllers; entry --> record