More control implementation and test cases.