Added finalized tests