Improve coverage
Created by: davidsowerby
Complexity to a minimum of 70%