Renaming + some test placeholders