Got rid of null file. Fixed controller and test