simplifying testing suite