Fix broken unit tests after changing challenges order