replacing classes on tests seems to be done, now template then make sure everything works