improved unittest support