More use instance paths so tests work.