Moved the test files into the appropriate folders. Also made some corrections.