Added ability to not auto-execute script when changed to Controller. Tests now pass again :)