Control: added few tests