Added new Enum values for ControllerType.  Created associated unit tests.