Update tests, move to be version specific.