I've done as you asked before - commented ALL places with such logic with "# TODO: Public api hack." Adding this flag cause me to rewrite and retest all again. Ok...