Some updates to the tests.