Tests corrected due to the changes in interface