Move suite option into TestAndParameters