changed name tag
fixed tests