Lots more work on macro expansion
Add simple macro parsing test