change var names and add test