This methods was untested, so this adds basic support for all data types currently tested by other test cases in this class.
Rhodri Pugh