MEDIUM / Working on EditingContext + fix unit tests