Correct tests for Plugin and Proxy based on recent changes