Clean up plugins spec
Refactor user methods into concerns