Added basic link-create function test, as a result: cleaned up some structure.