#674 created tests for indexer
#674 moved to more appropriate package
Merge remote branch 'fork/674'