small fixes in upgrade
fixed failing tests, added them into group
integrated SAM upgrade from CDN