[#59] - fix for broken tests