pointcut service refactoring + some tests