Fixing a few unit tests