- Added more unit tests
- Added support for indexed fields
test