Moved macros to seperate file. Fixed pod-tests architecture settings.