mclow Merge pull request #21 from MarcelRaad/fix_tests