3rd commit, cleaned test files