unit testing
moved watch