Working on main service tests and updating test deps