Yeah, this looks suspicious... rebasing and testing again