fix CC 2009 tests