Fix failing specs. [#82]
Refactor big helper to partial and smaller helper. [#82]
A little nil-safety. [#82]