Move macros back into main lib
Add macro test
Fix use location
Remove comment