Adjust some tests to not hardcode the 'test-data' directory. This breaks the Sonar-maven build that I am working on locally