deleting composite indexes on entity delete and fixed unit tests