Cleanup have_column
have_primary_key matcher