more re-org
tweak tests, add tests that partial-graft does not fire when element is disabled.  temporarily hack Makefile so load order is desirable