Fix up unit tests