Merge "removing the dynamic naming of the expected testplan"