CFY-1230 modified suites for debugging