Simplifying code and test data