Minor cosmetic fixes.
Added missing teardown test.