MOB-166 Fix failing tests
MOB-166 Simplified getPin function in Location model