Fix parser tests
Fix conditionals over mappings
Disable the tests that disrupt causality...
All macro tests pass