updated device and fixed import
Tests working, 1/2
Tests passing