Deleting unneeded elements + updating tests