Further unit testing fixes.