Fixed some stupidly designed unit tests that were needlessly dependent on the macro expansion implementation
Fixed some stupidly designed unit tests that were needlessly dependent on the macro expansion implementation

pereckerdal/blackhole