Small changes to test plugin