Add some more alphabets

Also make test code parameterized, to make testing easier.