Merge "More junits for PDP-REST"