[test] clean and more elaborate email changed lookups