Adding lon/lat as attributes, extend test script