further minimalize tests

Change-Id: I4182a5a3e61adaad24502b7d229fca411c770fc3