Use safe_load method
Add back --fail-fast and --order=random options
Alphabetize requires