fixed tests to run in the new directory structure