Updated names of some methods and cleaned up tests