Tidy up spec

Better variable names

Code tweaks for style

More tests

Dead code

Improved to wrap specific tags and ignore non-matching ones

Sorted out the single tags being altered by the editor