#7 Tests on general companents

Current test coverage is 47%.