Fixes for Issue #323
Added test indexer class for Issue #323