Rename methods; Add tests