Smoke tests: clean-up and small refactorings