updates to fix unit tests effected by timing of service initations