Remove/rename methods

Minor: Refactor tests