Currently changes to non-partials are being picked up. This PR Fixes
that and adds addition test coverage.

Fixes #2139