Fix issue with disabling services and add more test coverage