#370 - Improved coverage to 97%