unit test fixes: variable and datastore
unit test fixes: SaveFileC - all tests now succeed!