Merge pull request #1688 from rossriley/extensions-improvements-fixes

Tests work here and the changes are solid.

Fixes #1618