Added finer control for Org assoc for entities
Updated remove tests with asserts