Added classes for control structure and added tests for these classes