Refactoring, bugs correction and Optional Link tool added.
Added the new test folder