Add tearDown to make sure singleton is destroyed

Change-Id: Ie0071d831f892069267937ed4e99999fc8eaa2fc