Added coverage collection stuff