improve code coverage

improve code coverage to 77.62%