Plugin Test Fixes