fix an erroneous test
fix completion
handle changed atom structure in extract function refactoring
@NotNull