Added test:unitwatch