2204961 dataset class tests

Acceptance tests:

All tests must run and pass