Fixes specs and import errors issue hopefully
Merge pull request #98 from square/ricksong+yunus/import-errors-spec-fix

Fixes specs and import errors issue hopefully