Rename methods and add more tests