changes to helpers and test helpers