Fixed tests to use linked maps so json order is predictable and reasonable
Moved dataset samples into their own changeset