Added latest TeamMentor mappings
Some refactoring and Unit tests fixes