COOPR-372: change tests according to new functionality