markup cleaning and new test
test update
destroy & ui-class fix