Merge "Prox standalone test case changes:" into stable/gambia