Fix tests, remove comments

Change-Id: I5e7e21bd3f7eb39b110242d3d93d62607b310d6f
wip

Change-Id: I9270fa425f3eac0faa902c7d80dad493e9e1ede6