Fix the test suite.
Merge branch 'master' of github.com:tamentis/cartman