Added Input index methods and unit tests