Making all specs pass

Hey guys,

Fixing test suite, so we can safely start work in new features to the gem.