some fixes in test unit