Ensure old link removal
Added more tests
ff
Bugfixing