update with macro testing