Enhanced test suite to improve coverage.