Remove useless code & add intercept method tests