Enhanced tests to get 100% code coverage.