Improved test coverage
Simplified logging