Fix watch complex expressions

Added complex watch testcases