Fixing tests which were not running correctly.