improve code coverage and build