I think the collection frequency may need to go into the TermFreqs class rather than having a separate map for it - as things stand I'm not sure this is going to work properly with the remote backend or OP_SYNONYM.
I haven't tried to test this yet though.  Do your new testcases pass with the remote backend?