fixed some errors with the tests
Merge branch 'master' of github.com:philhofer/riak