Fixed and added tests for control codes
1.1.2