Use command line args instead of specific scripts for local settings
Better naming in mock tests (must!)