Increase test coverage for comasters

Hi,

I wanted to increase the tests for comasters, so I did.  This will help.

Huw.