Additional test coverage and enhancements.