Test throw added

still need to figure out curveing
conflict resolve