Fixed the test files. All tests succeed!