More tests synced with latest rabin2 -v change