Improving testing framework