Wrote unit test for new WatchList class. Fixed logical errors in WatchList found by test.