Update test Spring configurations Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e Former-commit-id: a862a4d1b9b34b3f93e54480b9fc482a234db918
Amend: Fix broken test Change-Id: I3b692255b5d84fffce174c0447970fe627f4a61e Former-commit-id: 45b5a9cffd6c57dc8ea1355ee623fcf6014dd377