Prettify the keyboard help
Add some more unit tests