Needed better coverage and test fix