Pull small changes on tests from mconf-rnp/mconf-web