add devise
tests fixed