correct 'reset!' and 'add-watch' to act like atoms. Added related tests.