Fix issues with DnD test data