Fixed more test bugs