Make tests pass for new diorama RC