Migrated more cdms2 tests