Merge pull request #708 from kwhatmough/next

Input test changes and fixes