some fix to tests