upgrade intern to 2.2.2 and fix failures due to that