Unit testing fixes.