Refactoring of system_tests