fix specs

Specs were broken when I tried to run. Fixed. Probably some other refactors that would make more sense. May submit a separate PR.