Merge "Fixing tests when run_validation is set to true"