Refactor ModifyItemBase to ModifyEntityTestBase

Will enable entities of all types to be created for api tests

Change-Id: I200a94eaa531cdc49631fa60915cc67c75073c10
Merge "Refactor ModifyItemBase to ModifyEntityTestBase"