Fixing coverage annotations
Making module options strict, removing need for custom ruleset