Improve paths for tests