Patched up unit tests.