Make the rest of the specs pass.
Merge pull request #16 from johnotander/spec_fixes

Make the rest of the specs pass.