Tests: updated with a macro to make it easier to read