cleaning up test code and adding test files