Merge "Add test for DatatypeFactory"