Watch proc and more tests