Removed test hooks