Merge "InputTests: Use mockito extended so that final classes can be mocked" into main