Fixing the supervisor test failures.