More tests to improve code coverage numbers