User and Device objects fixed, with testing file.