test helpers fixed