Cleanup a bunch of tests and add todos

Change-Id: Iae44427edee3ed2a62abdb5a8f5d9f1ed2e7d660
Merge "Cleanup a bunch of tests and add todos"