Tyding up MaidManagerService tests