Fixed constructor to compensate for known bug in Rapid Refresh metadata. -CMW
Expanded tests cover additional data types, including all RUC and RAP variations.