Initial test coverage.

Feedback extended to be more easily tested.