V.me return view refactor and tests, work in progress.