fx - Fixed typo in cli spec, broke help
Tests - updated to match head, all passing again.
Merged trunk fixes into map branch. Small fix to map tests (import issue like for enum).