Fixing up the tests. These were not running previously