Improved tests for 100% coverage