FIxed problems with kinds and added more tests