Revert "more tests and refactoring"

This reverts commit 873f6953f4b7c9e59897a741fd88f45131830374.
Finish Sign in