Fixed tests to use lists instead of macros