Improve set test to detect 6341