Added some testing for devise and removed some stuff