D'oh.
Update unit tests to be less ugly.