Moved into separate methods for convenience, much easier to stub for specs too.
No longer needed.
Got the stubbing sorted out, and put the right numbers in the fixtures (at last!)
Merge branch 'develop'
Can run specs from Rakefile. Mainly for Travis-CI.
Shiny badge!