CFY-1445 cleanup system_tests.sh