added location lookup provider and int tests. UNTESTED
merge
fixed merge error