had forgotten calls on instance variables. corrected + tests