Add tests and test runners which should have been in the previous commit.