Refactored for pep8
Layer related unit tests