Improving test suit.