Some improvements are made to the testing framework