General refactoring of system and stress tests into a consistent hierarchy.