Made small changes due to our test files