Minor changes to number of tests and how it's run