- Refactored specs to be closer to actual use case
- Adapted to index resources