Remove unnecessary require
Tighten requirements
Fix coverage calculation