And a quick tidy up of the tests

Change-Id: I260239c007d9d79477707cef45603dd5cfb5ac45