Important fix to tests