Modified tests to run from main directory