#4137 Fix problem with generic parameters
#4137 Fixing tests
#4137 Updating packages after surface api change
#4137 fixing tests