Refactor, new red tests.