Fixed issues with test file