One more refactoring of system_tests