renaming  to  and adding tests