Merge escAndSideClick into test