fix tests for new workspace/dataset changes

all dataset tests now expect workspace, too

cleanup old commented code, too