Both changes made (for all tests).