Test: Improve diagnostic output when using "matches_header" in unittests.
Tests: Fix matches_header
Tests: Use semantic add_type methods instead of generic add_int methods.