test fix
case selection fix
case selection fix deux
fix tests for NotDeletedCount fix