Added some more cases to kap5