Merge "Fix tests broken by test runner changes." into lmp-dev