added debug macros in some missing tests