Added datatype manips and tests