Fixing a variety of different tests.