Merge "JUnit addition for SDK-APP"