Completion support - fixes
Completion support - added mapping tests