Small fixes in the testing code