Improve base test

Change-Id: Ide63b0b60a7fa5885b623401d27cd51a6c0dad22
Update remaining tests

Change-Id: Ib20b54108991eb53aa19d0c904f620d0b5a92f2d
Merge topic 'gmv-test-cleanup' into next

cd2f904 Update remaining tests
3ffdd3f Improve base test