more spring test fixes