Tests changed to fit with class changes