Merge in code such that we are much closer to running the same test