Revert "Merge pull request #143 from martinogden/master"

This reverts commit 11687dfc963f75020e6f9899bd461cfb37eaab2a, reversing
changes made to 20d22d787ff398b56630ed8c73e91a71bfc399b2.
Revert "Merge pull request #131 from potatolondon/move-test-stubs-to-testrunner"

This reverts commit 265394b58f9772e8a5e079b00dd069e507978af1, reversing
changes made to 890c7f2e78fc0b7c12fa4deeab2a2a95628cb8cc.