minor test refactoring
test/installation refactoring