Minor changes to the testing routine