Improved "coverage" env