change test structure to avoid nested suite calls and multiple setup