Fixes services deps and adds more tests with empty deps.:wq