updated test helpers