add datum tests (and some fixes)