Update test suite.
Update test suite coverage to include Kawkabani2.