Fixed bugs with the test file