Renaming test split into base tests