Remove unnecessary setUp and tearDown

Change-Id: Ie3bc71d6b60ceab9057b2ac030041c8a847f02f6
Merge "Remove unnecessary setUp and tearDown"