Updated the tests to work with Dominic's changes.