HierarchyMoveDatasetTest: fix 6 tests.
ImporterTest: fix 2 failing tests.
AnnotationDeleteTest.java: remove NYI fail.