fixed tests + improved tags