Fix of failing tests (completion)