Minor changes in unittest