fix tests
differentiate tags from buttons and unify tag presentation