Merge "Fixed the SDK Junits and cleaned unused code"