Added tests, kinds now as tuple