Fixes for tests, configure interface.
Merge pull request #7 from duggan/fixes-1

Fixes to tests, and configure script.