normalize some bittest constructs