Fix compil error, start tagging tests