Adjustments for unittesting and started tests