Updated name and tests