Expand Tests and Coverage

[fchorney]

The tests need a refresh to test out various combinations of all defined types and features instead of only using the toy example as a test.
Various bits and pieces need coverage testing as well.

Aim to get 100% coverage with a more robust test data.