Amend tests

Change-Id: I3a3e90ebaafa335876ec8e847350ce21e311f02e