minor changes to Dataset constructor/tests