easymop-1 Improving coverage (not finished yet)