refs #738 - inner class reloading (table and parts)
* Avoid entity reset when calling same entity in mock