Fixing bugs related to plugin testing. More updates coming later tonight...