wrong macros
fix tests