tests were failing due to changes in certain class names, fixed.