[[ SimpleUnitTests ]] Various tweaks to make simple unit tests work