We are going to need a LOT more tests than this with all that stuff added. I think you about quadrupled the size of the library. I know the input stuff is interactive and hard to test, but I hold out hope that there's something we can do.