Added test
Added contrib handling to plugins