Refactor the testing system slightly