Cleanup the tests and pull the NullInputHandler into it's own file