Adding functionality to Input task and unit tests