Parallel mapping test covers more use cases + bug fix