Removed entity hierarchy
Canged tests for demodeling