Add ids to inputs for testing purposes
Use added ids in tests