Added index builder
Switched to custom analyzer
More tests