Fix up unit test run