Add tag to build
Fix test