Fixing a few tests