simplify code
improve test coverage : add build id
simplify code