Tests added to Index action
variables names changed
merge fixed