WIP:more testing

Change-Id: If2cc5673a694630115a205a7ddf310e0ad489142