Small refactor and the next failing test.