fix the test bugs...