Improvements to the testing system