Ronans Update

Updated tests as inconsistencies existed, started a User class