More changes to Validate and more new, revised tests