update tests WIP
compile fixes only, tests still WIP
Updated to match changed CMake functions.
Merge remote-tracking branch 'origin/next' into bugfix
further updates to test drive WIP
Further directory test updates (Iterator reset) fails when run in suite
but passes when run individually
Merge remote-tracking branch 'origin/bugfix' into fuse

Conflicts:
	CMakeLists.txt
Merge remote-tracking branch 'origin/bugfix' into fuse
Fixed "Add children" directory test.