Removed macro expressions thingy that is no longer required.
Fixed broken generated tests.