Fixed minor test bugs