change names and add test