Tidy config and code for coverage