Updated tests and helpers