more test code extracted from 2.6