Not for review: Update test cases and MerlinEntities