refactor keyboard test and remove unused options