Merge "Add TEST_MAPPING for input-related code"