ALmost done with the user changes to the tests
SHould pass pep8, but now more tests have to be written for user...