Updated tests and handlers