Merge "Improve patch and patchobject Base test case method attributes."