Merge pull request #367 from simonv3/master

Made links references to links
First round of test coverage increase
Tests up to speed for relevant things