Paritalized index, added more tests