Consolidated the entity storage tests