Minor cleanup of the tests