flakes and stuff, and a todo for tests

Change-Id: I99d76e5703ef839913ab3a92766920c981df23ce