Fix test coverage tags and lcoations