Update tests with more complete coverage.