Merge "Fix broken input tests"