Merge "Input tests no longer use test_per_src"