more work on tests

Change-Id: Iab4174280d8c78be7200b031a540f5bfe852da58