Added plug-in test hooks