Completed spring config change, tests pass.