tests changed to the new implementations