remove macro mod
Add tests
Rename functions