More unittest
Better index naming