[PATCH 5/5] Allow for command-line test override