started location finder test
fixed merge errors