Make test assertions more transparent, resolve clang warnings.