#1102 - fixing failing tests