added fix to tests