More refactoring
Minor tweak to tests after reddesign of System.set_system_status