38 improve validations

Improving validations by spotting holes in test coverage.

Closes #38