Rewriting the tests, Take 2.