Index-Singleton relationship updated, need to rewrite tests