resolved some test bugs