Updated tests to use test data dir