Fix issues with the custom test runner