Tests bugfix (after merge).