Updated the tests to match the new location