even more tests

Change-Id: Ia9a36aaab74b9ab76ceefc16b05bf3eae2a6a39d