Fixing store#index.
Fixing some tests.
Resolving remaining test errors.