Tests classpath changed / Refactoring of macro implementation