Made the save tests more robust