Samoht v2 with more tests