fix for THUCYDIDES-160 + fix for broken test