CFY-3 more work on system test env