DATAMONGO-686 - Fixed potential race-condition in QueryMapper.

Replaced the previous test case with a more simpler version.