Merge "JUnit additions for PAP-REST,SDK-APP"