Update Spring tests to latest version, remove unecessary dependencies. This should resolve broken tests