Add remaining tests

Change-Id: Ic76d3b6e7d3b47ed0ca70ade4496a07a2b82bbed