Updated main test
Merge branch 'master' of https://github.com/systemKMP/AAU-CPH-MED2014-G405