Revert "Merge pull request #195 from joakim-hove/ert-test-run"

This reverts commit 3a9a1f687f86aec49773e7fcccd82f7fc51a46bb, reversing
changes made to 9854ac9473bb7d265263a54b491cdc66d6ab9785.
Merge pull request #205 from flikka/master

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