created smaller expression for re-use. maybe I should move the calculate to the struct too
fixed test description