Cleaning up linking, fixing unit test, and adding coverage tests