Merge "Fix tests when running from the command line"