tests were broken because macro name changed

make two variables CACHE INTERNAL so that their values are available in other scopes (i.e. in test dirs)