Modify the tests to be more complete.