Modified tests to work with previous change.