Add additional cleaning for nasty tags and add tests too