initial commit of ExpectSet
path fixes
added ExpectSet, ExpectMap and InstanceExpectSet