Correcting the RVF RF2 ColumnTypes and tests.