Yeah, I know, but like you said, this is say nicer. We shouldn't have both but hell if I wanna go back and upgrade all the unit tests.