Fixed test file location, now has own set of test files as well...