PRD-4584: More fixes for the broken FunctionEditor and PRD-4638: Switching test case to synchronous mode