Merge "Rainy day UTs for rest interfaces"