Added User model, added tests, added workaround for tests