refactor dataset.xml to follow entity refactoring
Junit test can now pass