Finished with updating users, but need to fix some tests
Some tests green now