Fixes to tests, and configure script.