make changed to be able to run separate groups of tests