Add some functional test helpers