Make comparator and match_type available for all Test classes Signed-off-by: djmaze <djmaze@djmaze.lan>