Fixed tests and missing condition in useMapper method
Improved few details in mapper usage