change naming and add test