Update test helpers to satisfy new interfaces