[Graeme] Moved constants to fixture.
[Graeme] Simplified starting point; this is starting point used in the refactoring talk.