Add weighted edges, and a new test case. Also modify existing test cases...

... to accomidate new construct