changed some options in watch and some test