Changed two tests that failed because of the previous change.