Improved test adaptability