Working on a few tests
Merge branch 'master' of https://github.com/SpiderPigs/sidannarverkefni