Fixing macros, modified vector4 test