Added tests for Control