Updated tests

Saw some tests seemed to still have the TestMethod attribute. Updated
those and some tests were failing so added Setup and Teardown methods.
Tests are now all green.