Begin to restructure the testing code