Fixing tests which appeared to be broken