[ngrams] fix for json/csv upload for older terms

Also, some test refactoring and add servant-client to tests.