Various unittest changes.