MERGE: New version of GD algorithm and using Mock objects for unit-testing - not working completely!