Added world macro and tests