Improve testcoverage