FIX issues raised during code review
FIX make mongoContextProvidersQuery test stronger