Fix tests to work with new paths