more fixes on unittest timings...