SSM-98 - Convert code to use Config links (Jim)

Fix tests