Test coverage

This doesn't cover everything but is a decent start and would enable us to write tests for all the open issues. Setting to needs review.

This has been merged. I won't roll a new release just yet because there appears to be a bunch of other changes stacked on this one.
If no progress has been made by the end of the week, I'll roll a new release.

Automatically closed - issue fixed for 2 weeks with no activity.