Ensure entire test-suit runs with new refactorings