Minor changes, start of implementing keyboard input test