Add cleaned up unit tests moved from platform am: 35ef4b5382
am: 8acff00705

Change-Id: I6f3a572c8ddf2ef119552ac44223f3c981ada8d4