Fix make_empty

fix make_empty and test class.