Added more equivalency tests
Added index + generation code