Merge "Improve tempest tests for shares listing APIs"