NEW Shared index fields
Fixed tests (wrong var names)