first file to follow pep8
Better device mocks (WIP)

Moving the mocks down to a lower layer.  (Still working on this).