removal of devise
improve test suite