Changes to Dataset for tests