Added tests for kinds, closes #19