Merging Input testing into master

I feel that the "Input testing" branch is ready to be merged into the main branch.