Add new tests and remove unused code

Bug: 36101511
Test: included
Change-Id: Iaa1332f75ce518afe36b05f4d2497b38370db96f
3 files changed