Input test changes and fixes