Merge "Fix InputReader_test"