Fixed wrong ass test bugs