Improve code coverage, stabilize build