cleaned up tests and structure