Fixing a couple of tests