Corrections in keyboard handling and Unit Tests.