more testing

Change-Id: Ia3f8dd64fd2d54003565839ca7dc48e9523e708d