Fix tests to work with new path structure