Merge "JUnit additions for PAP-REST,API"