Improvements for tests, major refactor for signup tests