Class needs tested