Add new tests and fix problem with the second option being chosen on down arrow