Merge "Router API Tests Enhancements"