Cleanup tests + Move macro to include file