cleaned up tests
some l2 and test refactoring