Merge "JUnit additions for SDK-APP"