Tests work now, too.

Change-Id: Ie9dccfc045bfbf72641e5c76f8b3d4fc28a99442