Fixing tests with validate