Unit test cleanup

Change-Id: Ic3e0d5d57a2b1499d625378a36baf9614395e541