Add more macro unit tests
Tweak macro string parsing