Add waitFor to allow a test to wait synchronously for some condition.
Rename the macros for better readability.
Clean up the example tests a bit.