Fix tests to use new Validation container.