Which episode of gilmore girls did jess dress up as luke, & which one did he hold an umbrella over rorys head?

In the first, he was wearing a plaid shirt and a baseball cap like luke always does and he was just teasing and imitating luke. And in the second, luke hired construction workers to extend lukes apartment so both he and jess could fit, and jess decided to be funny and open an umbrella over rorys head as chunks of cement were flying throughout the diner because of the construction. Im pretty sure theyre both season 2 episodes but i could be wrong.