started separating the macros to test each individually