fixes to the way that tests work