Reduced warnings.
Small update of Plugtest code.