Merge pull request #205 from flikka/master

Revert "Merge pull request #195 from joakim-hove/ert-test-run" - broke a few tests and stuff