CFY-1445 more system_tests.sh cleanup