update tests... premacro