Rebuilt User model and migration. Passes all tests