Fixed the failing architecture tests in jenkins - update and delete

please review it
thanks

Also, attaching the output of the results after execution
https://gist.github.com/tkolhar/40ca0c7d113e768abe44