Don't leave broken, commented out tests lying around.
Simplify unit tests code with mkRuntime()
Merge pull request #1195 from dotcloud/tests-cleanup

* Hack: tests cleanup