Cleaned up test macros and helpers significantly.