fix some warnings
fix test errors
Revert "fix test errors"

This reverts commit d4876946dbfe4732eb02c7fc49ea8c8afd40e21b.
fix some warnings
Merge pull request #144 from guedes/master

fix warnings and errors from 'make test' output