Fix up tests for clean install.