First version of better C test macros