re arrange system test