configuration, and some test fixes