Converted to parametrized test; not as nice as it ought to be, but not exactly easy using OCUnit...