Updated tests and test helpers