These functions are a great addition...could probably simplify some of our other test code as well