Renames + add tests