[#13] Fixed existing broken tests