Added support for multiple test sets