Minor fixes to the input testing code