Added test hooks