Shutdown controller if not testing.
Few Tests related to function redefinition
Merge pull request #1053 from monikaprabhu/ChocoButter

Shutdown controller if not testing.