Update layer tests with new imports
A few pep8 corrections