Revert "Changed tests to reflect new behaviour."

This reverts commit 97370fbb954f47f10f83e71c642f2c4c72b63410.