Fixes for tests, configure interface.