Fix RiakIndexTest
Fix AnnotationScannerTest
RiakIndexConverterTest passes