Fix to run the suite of tests