rename with new constructor, remove deprecated tests