changing names, and updated tests