added Controllable
fixed Controllable Tests