Improve coverage action and tests