Refactor includes test

Signed-off-by: Michael Sauter <mail@michaelsauter.net>
Refactor includesAsKind test

Signed-off-by: Michael Sauter <mail@michaelsauter.net>
Refactor forKind test

Signed-off-by: Michael Sauter <mail@michaelsauter.net>