Tests stuggling against newest Datum.
Updated for merge