Renamed internal macro + fixed tests