fix CC 2008, 2009 tests