Fix expected number of roles to include also P2 contributed roles

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>