Merge of package test into development.

We've successfully implemented the transition to a package, so might just as well merge this back into development branch.