Merge pull request #99 from evoskuil/version2

Make test assertions more transparent, resolve clang warnings.