Integrating testing into master