Updated tests and methods