If ever you need a random-roll for what type of knight a character faces in tournament, or just new ideas, what follows is a great big list (some with further descriptions and nicknames) of different sorts of knights.
Some of the names of locations & faiths are from Midian, but these are easily changed to fit different campaign settings.
These Trolls travel land and sea in an eternal search for their next war. The Host of Battle—for they have no other name for themselves—is part mercenary army, part ethnicity.
Have a large room that elevates either up or down when triggering a trap. The floor can bring the players to new levels, where a mighty beast roams, or the floor flattens the players into the ceiling or drop into a pit of lava.