Add Rivet to testing