clean up add suite tests logic for more usability