coverage: Improve testing