Move make test target to separate script
Move json_enhancements target to separate script
Remove unused variables from Makefile

Fixes Bug 1038340