Updated tests and names