fixed 2i test bugs