Removing tests since they are not compatible
More renaming