Add initial NDT support and abstract unit tests (again).