Refactors some specs. Less bad now.
Merge pull request #6 from desmondrawls/spec-refactor

Refactors some specs. Less bad now.