Initial fix for #116 - turns out that we had an unnecessary next layer check...

Initial fix for #116 - turns out that we had an unnecessary next layer check earlier than it needed to be.  Removing that fixes the issue.

Main thing now:  fleshing out the testing keyboard to make the tests a little simpler.