Made test utility more powerful