Some tweaking and tests for package local.  Closes #42