More support for number key test