Commit partially through fixing broken tests from implementing the additional user features.