Working tests - dataset singleton is gone