Added more returns for test files