Add require_relatives statements to test files
Merge branch 'emily'