Merge "Add tests list tenant usage"