fixes for latest unittest lib