more tests
removed conflicting files