Fixed support for multiple suites
Fixed constructor