improved test-coverage