Improved tests with coverage support
Improved tests with coverage support