Remove profile
Fixing PEP8
More pep8
Updating Tests.
Updating Tests.
Changing the default import path to the defaults (as per Charlottes request)