(issue #951) replace general links
(issue #951) update unit tests