TST: more fixes
BUG: reindex fixed!