Better config, all tests pass.