Switched from environment variables to command-line arguments in test code