Add new test hooks