Re-incorporate midway testing into the tools with update from Matias.