Fixing unit tests post rebase Some changes that merged cleanly actually broke the unit tests, so this fixes them.
2012-02-21T15:09:04