Fixed core tests for 2.2
Legacy index tests (for batches) moved to level 2.
Core test coverage for 2.2