Rearrange where the macros are grouped.
Updated tests and sequence logic for data only.