Renamed to OCMVerifyAll to avoid future clash.
Made sure slightly paranoid test passes.
Simplified the stub and expect macros.

Maybe I did too much JavaScript recently...