Minor changes in Mock Services