Unify setUp/tearDown in ApiSetup, rather than duplicating in ApiWatchTest. Also fix...