Redesign of Pointcut test