Improve test to get 100% code coverage