Add type identification for one pair and corresponding test
Add type identification for flush and corresponding test