Refactor tests slightly

Didn't need __block level NSString when the msg was sufficient.
I suppose this is already allocating memory enough times, but
it's not very slow at all.