NOJIRA - controller cleanup and stub unit tests