Add artifacts support
fix test