Add test ARCH; remove macros.h dependency to allow to include this file also in prepr...