Clean up plugin and update specs to new syntax.