Rewriting the tests, take 1.