Fixes failing tests, adds tag builder to label.