ADD: Tests; MOD: Changed from $ to #link_name#;