Updated tests and method names