Clean-up of tests

Change-Id: I782ac3a0f348bf62a086d7246323165422192ce6