Fixing tests which where discovered to be broken.