Fix one plugin test
Fix integration test