Making all specs pass

Fixing test suite.