Refactor history spec
Merge pull request #37 from mattbeedle/history

Refactor history spec