[QA] WIP New version of Nearby test

Change-Id: I65c81d9c9d2aedb1ee4c3705ab6fc615bb235e91